gtkcalendar: Use key controller to track focus changes

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index e52b5e7911b8f112ca852eea340dd1f95165a64d..643bbf9ddb9e4cbb7cb0d81b8bbca647fe6cd5e8 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -301,8 +301,8 @@ static gboolean gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *
                                                          guint                  keycode,
                                                          GdkModifierType        state,
                                                          GtkWidget             *widget);
-static gboolean gtk_calendar_event          (GtkWidget        *widget,
-                                             GdkEvent         *event);
+static void     gtk_calendar_key_controller_focus       (GtkEventControllerKey *controller,
+                                                         GtkWidget             *widget);
 static void     gtk_calendar_grab_notify    (GtkWidget        *widget,
                                              gboolean          was_grabbed);
 static void     gtk_calendar_state_flags_changed  (GtkWidget     *widget,
@@ -380,7 +380,6 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   widget_class->size_allocate = gtk_calendar_size_allocate;
   widget_class->state_flags_changed = gtk_calendar_state_flags_changed;
   widget_class->grab_notify = gtk_calendar_grab_notify;
-  widget_class->event = gtk_calendar_event;
   widget_class->query_tooltip = gtk_calendar_query_tooltip;
 
   widget_class->drag_data_get = gtk_calendar_drag_data_get;
@@ -694,6 +693,12 @@ gtk_calendar_init (GtkCalendar *calendar)
   g_signal_connect (priv->key_controller, "key-pressed",
                     G_CALLBACK (gtk_calendar_key_controller_key_pressed),
                     calendar);
+  g_signal_connect (priv->key_controller, "focus-in",
+                    G_CALLBACK (gtk_calendar_key_controller_focus),
+                    calendar);
+  g_signal_connect (priv->key_controller, "focus-out",
+                    G_CALLBACK (gtk_calendar_key_controller_focus),
+                    calendar);
 
   if (!default_abbreviated_dayname[0])
     for (i=0; i<7; i++)
@@ -2870,6 +2875,17 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
   return return_val;
 }
 
+static void
+gtk_calendar_key_controller_focus (GtkEventControllerKey *key,
+                                   GtkWidget             *widget)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+
+  calendar_queue_refresh (calendar);
+  calendar_stop_spinning (calendar);
+  calendar->priv->in_drag = 0;
+}
+
 \f
 /****************************************
  *           Misc widget methods        *
@@ -2897,23 +2913,6 @@ gtk_calendar_grab_notify (GtkWidget *widget,
     calendar_stop_spinning (GTK_CALENDAR (widget));
 }
 
-static gboolean
-gtk_calendar_event (GtkWidget *widget,
-                    GdkEvent  *event)
-{
-  GtkCalendar *calendar = GTK_CALENDAR (widget);
-
-  if (gdk_event_get_event_type (event) == GDK_FOCUS_CHANGE)
-    {
-      calendar_queue_refresh (calendar);
-      calendar_stop_spinning (calendar);
-
-      calendar->priv->in_drag = 0;
-    }
-
-  return GDK_EVENT_PROPAGATE;
-}
-
 \f
 /****************************************
  *          Drag and Drop               *